From: Kenichi Handa <handa@etlken>
Date: Mon, 9 Aug 2010 11:05:27 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~4362
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=aa151b90b64cc6861629c505badc7d766586b288;p=emacs.git

merge trunk
---

aa151b90b64cc6861629c505badc7d766586b288